Remove extra -I when building on Mac. No reason to search that directory

a zillion times when only one file needs mac/libusb/

git-svn-id: http://gpsbabel.googlecode.com/svn/trunk@4662 f51c46e8-681c-474f-0cfe-069cfd0219fb

diff --git a/gpsbabel/configure b/gpsbabel/configure
index b1bc21859d19e598c2bb8f36fd75557d739134ea..682163f31523bbb8ff02d068b5a47f47209d65ee 100755 (executable)
--- a/gpsbabel/configure
+++ b/gpsbabel/configure
@@ -4599,9 +4599,8 @@ rm -f core conftest.err conftest.$ac_objext \
       USB_LIBS="-framework  IOKit -framework CoreFoundation"
       $as_echo "#define HAVE_LIBUSB 1" >>confdefs.h
 
-      CFLAGS="$CFLAGS -Imac/libusb/"
 
-      # On mac use frameworks for includes and library files.
+      # On Mac, use frameworks for includes and library files.
       # Macports uses a non-standard build of Qt with an added
       # QT_INSTALL_FRAMEWORKS flag, so look for thier custom
       # version first.  That will fail on 'normal' Qt so fall

diff --git a/gpsbabel/configure.in b/gpsbabel/configure.in
index 949a58948d692413325b8a5a77c5a257175c7a6d..abcb5def051d6326ae13e03ae87af6e91eb648c0 100644 (file)
--- a/gpsbabel/configure.in
+++ b/gpsbabel/configure.in
@@ -206,9 +206,8 @@ case "$target" in
       mac/libusb/usb.o "
       USB_LIBS="-framework  IOKit -framework CoreFoundation"
       AC_DEFINE(HAVE_LIBUSB, 1)
-      CFLAGS="$CFLAGS -Imac/libusb/"
  
-      # On mac use frameworks for includes and library files.
+      # On Mac, use frameworks for includes and library files.
       # Macports uses a non-standard build of Qt with an added 
       # QT_INSTALL_FRAMEWORKS flag, so look for thier custom
       # version first.  That will fail on 'normal' Qt so fall 

diff --git a/gpsbabel/jeeps/gpslibusb.cc b/gpsbabel/jeeps/gpslibusb.cc
index 5122ff11cf0b350ead9e57bb8f891913c71d048e..23b1e7a67fd8c4e3b6f709d37adb3afb24178146 100644 (file)
--- a/gpsbabel/jeeps/gpslibusb.cc
+++ b/gpsbabel/jeeps/gpslibusb.cc
@@ -26,7 +26,12 @@
 #include "config.h"
 #endif
 #if HAVE_LIBUSB
-#include "usb.h"
+#  if __APPLE__
+     // We use our own (slightly modified) libusb.
+#    include "mac/libusb/usb.h"
+#  else
+#    include "usb.h"
+#  endif
 #include "gps.h"
 #include "garminusb.h"
 #include "gpsusbcommon.h"